debian/: Multi-Arch support added

diff --git a/debian/compat b/debian/compat
index 45a4fb75db864000d01701c0f7a51864bd4daabf..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9

diff --git a/debian/control b/debian/control
index dd23c624372658a93a8aa1eecf9024f61ec87d8c..86c68cba26e645fa8221c16e81f7bd97a7c5e29f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Matteo F. Vescovi <mfv.debian@gmail.com>
 Build-Depends: autotools-dev,
-               cdbs,
-               debhelper (>= 8),
+               cdbs (>= 0.4.93~),
+               debhelper (>= 9),
                gobject-introspection,
                libgirepository1.0-dev,
                pkg-config
@@ -15,6 +15,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/babl.git
 
 Package: libbabl-0.1-0
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: Dynamic, any to any, pixel format conversion library
@@ -25,6 +26,7 @@ Description: Dynamic, any to any, pixel format conversion library
 
 Package: libbabl-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libbabl-0.1-0 (= ${binary:Version}),
          ${misc:Depends}
@@ -57,6 +59,7 @@ Package: libbabl-0.1-0-dbg
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: libbabl-0.1-0 (= ${binary:Version}),
          ${misc:Depends}
 Description: Dynamic, any to any, pixel format conversion library (debugging symbols)
@@ -70,6 +73,7 @@ Description: Dynamic, any to any, pixel format conversion library (debugging sym
 Package: gir1.2-babl-0.1
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: libbabl-0.1-0 (= ${binary:Version}),
          ${misc:Depends},
          ${gir:Depends}

diff --git a/debian/gir1.2-babl-0.1.install b/debian/gir1.2-babl-0.1.install
index 5d8ff5ce9c5fe19603b3578a67bbd4c97b3c959a..99173f4c287ce2925a9d44f0e293e265cfc8f31a 100644 (file)
--- a/debian/gir1.2-babl-0.1.install
+++ b/debian/gir1.2-babl-0.1.install
@@ -1 +1 @@
-usr/lib/girepository-1.0/Babl-0.1.typelib
+usr/lib/*/girepository-1.0/Babl-0.1.typelib

diff --git a/debian/libbabl-0.1-0.install b/debian/libbabl-0.1-0.install
index 90761bfdf94964b659bcd3d510dec0189387eb90..48dff0795d30dc15092e2619ac3f7690c6c51d7a 100644 (file)
--- a/debian/libbabl-0.1-0.install
+++ b/debian/libbabl-0.1-0.install
@@ -1,2 +1,2 @@
-usr/lib/libbabl*.so.*
-usr/lib/babl-*/*.so
+usr/lib/*/libbabl*.so.*
+usr/lib/*/babl-*/*.so

diff --git a/debian/libbabl-dev.install b/debian/libbabl-dev.install
index 39d1d2d7c6c2dc8e6852216e44e24fdb2ec7f171..037fca510f4d89800431d08f270903e930b6c39f 100644 (file)
--- a/debian/libbabl-dev.install
+++ b/debian/libbabl-dev.install
@@ -1,4 +1,4 @@
 usr/include/
-usr/lib/libbabl*.so
-usr/lib/pkgconfig/
+usr/lib/*/libbabl*.so
+usr/lib/*/pkgconfig/
 usr/share/gir-1.0/Babl-0.1.gir

diff --git a/debian/rules b/debian/rules
index 05bda0f181722bf9525a1b431eff042857c604a2..c6f73d5490a47c05150be870addfcd29334e1153 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,10 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 export LDFLAGS += -Wl,--as-needed
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-DEB_DH_MAKESHLIBS_ARGS_libbabl-0.1-0 = "--exclude=/usr/lib/babl-0.1"
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+DEB_DH_MAKESHLIBS_ARGS_libbabl-0.1-0 = "--exclude=/usr/lib/$(DEB_HOST_MULTIARCH)/babl-0.1"
 DEB_DH_INSTALLDOCS_ARGS_libbabl-0.1-doc = "--exclude=Makefile"
 
 common-binary-predeb-arch:: list-missing